merge with jlee
minor fix