fixed null or assign which fucked up my build