Fixing noob bug