fixing more on #15