Bugfix for the previous commit