Start implementing issue #390