Commented out SBAHJ check