sync with #239; closes #243