MartinRJ/bug-540 archive