bug fixes intests