Fixes with valid