bug fixes
nullable object reference