Fixes SHAN-60