Fixed tunable issue