Fix #BB-554
Fix #BB-487