should now also work with primary latches