Fixed #57, Tinkered with #50