Fixed design bug in Plan