added hack from issue #490