added control to prevent reentrant calls
1 file changed