Need to review bug

Just ignore this...