Ticket #1399: Filter type parameter to be safer