Fixing the bad button behaviour.