fix for issue #216