Fixes #32 switch take and takeall button