Fix for 2.7 bug