Fix for 'Unexpected message: {action, …}'