Fix for #242

cc #242