Fixed issue number 5