Fix and a temporary fix