Update for an Issue #481
Adding support for ~