Fixed small bug: working towards issue #24.