Fix for Issues #22