fix for SS-287