Fix for M7

Fixed