found and semi-fixed new bug