Fix messages bug for studio. HACK