Fix the None replacement 'hack' with another 'hack'.. Hmm