Fixed for master app.