Fix this from returning null at the end.