Added mute_signals hack for factories