a bit improvement to internal api
fixes a bag