Corrected memory bugs in non_separable part.