Prevents issue #54