tring to fix issues