HOT FIX: APD-789