fixes issue #61 & #55