Fixed fingbugs issue