BUG FIX: Issue 60