Fix on changing module