* fix some calling