Attempt to solve nil issue
Fixed nil issue