Handling empty intervals for #44