Pushed fix for #391