reduced more bugs