Applet Problem Fix

This is the pull corresponding to the master hotfix.