Addressing #110, need to be checked.