Fixing issue 74