Fix import state behaviour