Dev/euca 7463

Fixed regression that was there in 3.3.