Fixing some shizzzz