Clien-side handling fix