Fixing #1: mapping error