Hackfix for ID scoping issue