fixed ECLIPSE-1026