some fixes number bla-bla