I think I fixed a bug ...