Fixed the multiple states