Master undefined eventpath fix