TACHYON-54 bug fix

Typical changes, bug fix