Bug fix
Handle resize
CS