bug fixes for first beam