Fix logic
Release 8.1.0.Final