Revert "Trying to fix error in another way"

This reverts commit bdf254a843c28d58539e2a072b5972fefa5c23dc.