Fix for SP-313