fix for toolkit scope