Bugfix for 4bb8a710bec930a2c8df3e1b1161f90a2a61d326