Proposed fix for #19 (needs testing)