Fixed #557