Finish fixing #3194