More bugs related to #26