Subview bug fix