Made increment more robust