Fixed #557.