fix for issue #52