runtime exception bug fix
merged, runtime exception bug fix