Fix additional problems in issue #13