BAC-1004: improve the check as suggested by @Grunny