[NH] Finally correct. So much for local testing