Close issue #335