Fix for UPSA