Fixed issue 138.