Fixed issue#30.