Bugfix, hope it works