ticket 635, version 3.5.4.1