Bug fix (prevent double click)