Issue #25 16/17