Fixed #179
Fixed #179, #180