One bug fix and one feature add