Fix remaind