Fix for issue with client aliases