Port missing #540 on master