Fixing issues related to #63