update to r539 (thanks to jsst)