Changing to and from make break

[stakach]

There is a possible issue here where two module instances are running simultaneously.
We should check for possible race conditions