Fix for #2686