Fixed #56. Fixed #59.