Added improved doober check