Fix #154 by updating the current data object properly