Merge fix from refactor
Merge