Fixed issue number 72