fixed ECLIPSE-1076