Fixed #54, #55