Fix for Issues #118 and #110