relicated the fix from insamlo-fa (closes #99)