Fix Logic for PR #58.