Fixed #417