fixes bugs of last commit