Form now sends the right button, resolves #257