Bugfix for 3118