change and fix