Fixed serious bug, should work now