=act #3640 Fixes and one more test-case