Fixed issue number 4