WIP - Fixed a bug (missed a = NULL)