Another BASS Fix (WIP)