Fixed #49, #50