RTGOV-314 Further fix to reduce errors on importing to jbds