Implements #58 (n°2)
Fixes previous commit. Maybe.