Fixes bootstrap problem