bug fixes in sprint 10