ticket:14 fixes