fixed run-forever issue