capture/bug fixes