OK, fixed the static reference issue for real this time.