Changed based on feedback and issue #254.