Bug fix for <f />