# Issue 12 resolution