Bugfix/ll 708

As they were very closely tied together this also includes 707