Fixed FF timing issue