Complex method fix