this would be good if it worked as well

Changes in 1.509 messed it up