Fix runtime issuse