Fixed #334