fix for FRDA-33