BUg Fix for FMPRO-76