Untested, but this should be a fix