3.0

Fix for ##1861