Fix problem 3 for issue #80