Revert "Fixes"

This reverts commit f000399d006e84e0ed7927ac1cfd98a5b33b1405.
Fix