fixed setup
changes by kory