Manually apply pull request #96 via olegKoshmeliuk