Think suffix have been completly fixed now