Fix for updated source