Replace fatal function by a click-based counterpart