fix for ERRAI-696