Fixing some shizzle