bug fixing as per test site