Fixes issue #63, #64