fix remider logic