Platform bug fix