Attempting to fix #43

Fix for issue #43