Added more assertion