@shackbarth 
This should avoid the need for distinct now.