Fixed according to Nicola's review comments