Bugfix: temp work-around to what is probably a scope problem