Fixed for M513 pre-release