Bug fix for .set