fixing issues around