Fixing last bug caused by merge conflicts