fixing #35; lain: new commit