fix some runtime errors
Merge branch 'jangwook'