Fixed Issue #76