Fixed and validated version