Fix for issue #35
Fix for issue #36