This one is nice. It should solve #59  for all the implementations.