Fixing issue with single;