Resolved ERRAI-569