attempting bug fixes