fix for SS-416