Fix simple mode problems