Fix for design