fix for issue #22 - stay compatible to existing version