Fix enhancement #77
Fix enhancement #78