Add the 'Fixed Issue #34' from the original branch