Fixed

@xliiv @quamilek please review