FIXED code
REFIXED