This is an improvement for #44