Issue #149 - Fixed reference key exception