Fix RuntimeException