Fix for multiple address