Fixes #101 for ASB, can't be fixed for ASQ