Bug Fix: Fix Issue #31