Feature shared bugfix