merge error/issue #76