bug #933 - add lock to decorator