fixing #240