Making 1.3.2 compatable