Fixed issue#498