Fix reference, add default block