Fix Design bug