fixed ECLIPSE-905