fix first time issue