quick hack to try to avoid click race conditions