Fixed issue#24.