not sure if this is fix… need some more tests...