Fixed for latest master