Updated super() as per http://www.artima.com/weblogs/viewpost.jsp?thread=208549

but would be worth someone else checking if poss.