Trying to Fix issues