Fixed issue#12