real bugfix for issue #1