Fix for FX305

Didn't look like Akila was going to do this. I think this should go in now.