Fix for #178