Fixed #46

Gogogo!