Merge messed up some code, commit to fix