Quick fix for master