Combined two lines.
First attempt at fixing issue #49.