I've addressed this in #139