issue #304