Remove this hack