Prepared issue #60