fixed issue ECLIPSE-1082