forgot to remove unnecessary nil check