fixed one of many issues caused by bootstrap (TODO: Remove as much bootstrap as possible)