fixes issue #3 and #6