fixed ECLIPSE-1016