Fix for #14

Explanation in commit comments