Fix as an independent module