corrections of inline functions
more strict