Revert "fix for spec"

This reverts commit c38aeb827ba421d9f5cd5952a6f9fa8658b4bf4c.
few fixes
merge