Bug fix. Behaviour of buttons is now crystal.