[BAM]Fix: Bugfixing