Merge "fix typo that can lead on bugs"