* Fixed a Null Reference bug