[#2] fixing state