First try of fixing method order.