Fix issue when milestone is None