*MAYBE* this will help to speed up preferential.
fix for previous commit
Merge remote-tracking branch 'internetz/master'