add a nilcheck here too i think?