[BAM]Fix: Minor bug fixing