Fixed RuntimeException