Improve distribution and fix issue