Experimental: Fix for ATV3 with no pw field