Master is broken! Fast-fix