Some design bug fix