Hopefully fix distinct issue