Fix bug. Framework seems OK.