Fix recurring bug in issue #13