Fixing wrong design