real fix for issue #27