Fix for issue #63

Fix for issue #63