minor change and fix