issues #21 and #25