Add comments for a better fix