First cut
Before problem fix (FA on null and equivalence)