Update according to story #1544

More changes according to #1544