Fixes #38 (but should be made more generic, (web)scripts need an overhaul..)