Title: Fix Issue #2