Workaround for CLJ-944