Fix for eagle