#154 changed gap filling logic by interval