Make it work with block methods too