Handled. (If you're around and can find another solution of same class, please raise an issue)

Fixed both ;-)