Refixed function