NO MERGE: Fix a data overwritten bug

Fixes #12 

<!---
@huboard:{"order":15.75,"milestone_order":19,"custom_state":""}
-->