Fixed incrementing bug