fix use of old api
work on module behavior