Bugfix, now works