Bug fix modal teacher