Revert changes, it seemed to work before