Fixed issue Fifty-Nine