fixing #333