Fix for issue #26
Fix for issue #26