Temporary Fix for L Developer Preview