Fixed #296