Fixed issue with missing notes in border cases.