Fix for #3

//cc @stritti