Another fix or #411