Fix static analysis issue in base layer