Fixed errors after the fix of #3