Fixed problem similar to SCI-1467