Possible fix for issues #63 and #64