fixing issues related to #60