Fixing broken aware