Fixing normal bug