Fixed method signature to work on both 0.8 and 0.10