Trying to fix a issue