reinstate original fix for #31
1.6.19