Bugfix for 1080306