Fixing claimed bug