Fix issue #37 part II