Fix to avoid the match variable to improve performance
Merge branch 'robario-patch-1' into develop