3.0

Fix for #3453