Updated to Joakim's change in the master branch