A small change and fix