Bug fixed after merge -- Sorry to commit on the master