Fix @alneberg suggestions, tack!