Fixed on #2