Should take care of Issue #26.