#bm-6 Fixed