Restrict movement again. Related to #119