Fix Workaround 52