fixed ECLIPSE-957