deals with #5 and fixes issue #7