Add more assertion