Fix #19 - bug introduced by #16