Refactor 9939