Design and behavior fix