Bugfixing in Base.php. Together with Frank