Fix bug and inc incremental