Fixes STR-942