shouldnt have removed that nil check