Fix/assign

fix issue #41