Fixed bug due to non-global scope when included from Setup.php