Fix for #238