Resolved issue#7