[FIX] Several problems with previous commit