Working on fixing problem