Temp fix for M.core.dialgoue bug