fixed bugs from preview commits