manually applying the one change i need from v1.0.3