Solve issue#7