First attempt to fix dplyr 0.3 compatability issues