Fixes edge case with None and category types