Bugfix for work