fixes in question