Message Selection Fix