fix currentCheck