Adding fix for reverting back to matrix mode