Temporary fix to fcorrect scope issue