module and db fix