fixing module bugs temporarily