Initial support for #254, Fix for #260