Fix function.
Merge branch '6043-1' of github.com:openscholar/openscholar into 6043-1