removed dynamic shortcut to fix tests