fixes following issues: