Fix duplicate block