Fix for #242