Fix Pull request #23