Fixed bug with incrementing