fixed ECLIPSE-958