Feature 954: minor update