First step on fixing #1