Fix broken functionality