Quick fix for #305