@ajft yep, have implemented this exact bug