Fix for ERRAI-699.