@markstory Thanks! This was the part of the patch I really didn't like — I'll try to re-work it