fixing #61