Fixing invalid