Bugfix: None to null