- Fix for #26