Fixes #1 - problems with move-assignment