Issue #24 16/17