Fix fill method

Fixes #107

and this