bug fix maybr