Implement fix for the issue mentioned in #13.