Closed #158, unable to reproceduce this bug in current TF code, but found out another bug and fixed it