fixed mixed nil issue