Fixed #61, a little