Compatibility to current rust master