Fixed base class data getting blown out

Issue #3