try fixing #1