fix CORE-993

Hi,

Here is a patch to fix https://liquibase.jira.com/browse/CORE-993

I'm not sure if it's the right way to fix that, let me know if we can do better or put the fix into a better place.

Cheers