Fixed #50, #47