Issue: #73

  * Fixing offset follow on complex paths