Bug fix with second button!