Fix harmful behaviour