Fixes, but breaks server