fixing issue#11