Fixed from email feedback