Integration fix