Fix #104 (closed)
Fix #103 (closed) (?)
Blocks !394 (closed)
Blocks !400 (closed)
Blocks !454 (closed)