Fixed for #14