Fix for null collumns