Work #9.5.2

Small bug