Ugly commit. default dirrectory set to nil