Fixed for new method signatures