Fix for clean flat wish creation