Added back hack to allow 8 angles