TODO: Fix bug with bootstrap