Fixed issue in runtime