Fix previous commit for SP-313