Fix for #385