Fixed nightwatch bug