Again with fixed bug #TST-4 Fixed
Fix TST-4