[#2] This is to fix issue 2