Parking Lot on IAX2 servers announcement to wrong device

We have two locations with a server at each location connected IAX2. The calls are answered at Location A and the parking lot is on this server, when someone at location A calls someone at location B and Parks them everything is fine. If someone at Location B parks someone the wrong device hears the parking lot announcement.
Also I believe it is related the BLF on the devices do not work across the IAX2 connection. Is there any known fixes?

FreePBX Centos Linux 6.5