Fix first part of Issue #13