Fixing bug with FAA