Fix issue with long beginning gap