Fixing runtime issue caused by test commit earlier