Fixed #46, #53, #55