Bugfix for latest update