we seem to need this None check