issue #526