Fixes SHAN-61, Fixes SHAN-62