Fixed #46