Added fix to msg selector