fixed fcuk 1.6-1.7 probs