Fixed issue#24