fix to ERRAI-536