Fix FI with explicit before and after when non-zero