Fix & checking