Fixes #1

Already fixed by last commits