Another attempt fix for #2