quick and dirty fix merged in from bugfix commit c0ec48de3e6a348825f68e4142a474a0ac2b0d3e