Bugfix, possibly