fix for issue #27