Fixed none problem