Fixed issue where message reception would not be properly handled