Fix for catalogue client