HOTFIX (Experimental Build 1.04)