issue �#1: added 12