Resolve design bug