Fix #13 and #14

Maybe the old version was just fine. Is there really a change in behavior with this change?