Fixed bug with lived in states