Castling fix