v1.2.3.474 - address ticket #866