Now it should work, untested