Bug fixes
Fixed merge mistake