Fix for booststrap loading