fixes issues #4 and #6