Fixed Null model handling