Working on a slight bug