Fix the pattern match so the correct messages get returned
Fix for sending one too many messages back