Working on #044. Now it works :)