Fixes issue #'s 6 & 9