more glue&delegation checks, thanks Kees Monshouwer