fix suite builder logic