Fixed issue#14