BUG: Fixed handle incrementation