Bugfix for previous commit