Fixed #34, #57