evolutions and test for issue #508