Emission time fix without changing the distribution. There's a plan to change it