Added support fix for Frodo 12