Resolve aliasing issues #152, #212