Should not need this horrendous bodgery now.