Fix DB2 Issue