Account for empty last measure