bug fixing -Capriatto