Fix for SS-395