[Feb 2] Bugfix and update (updated Feb 5)