Adjustment after Gustavo comment on commit 8d1a6c4