slight adjustment for issue #12