Relocate var and fix