1.3.2 working commit