:bug: Fixed part of issue #18 (items 2 and 3)