MADS: Fix for actions get repeated endlessly