Trying to fix some issue