Merge 1.3.2 Fix