Additional bugfix for issue #1136