Fix for integration