Fix a buggy behaviour