Minor fix to noworking code move