Null space issues fixed