Fix for mmdemo