fixes in run() method