Fix problem 5
merged