Design bug fixed