Revert "better fix"

This reverts commit 4e7a35cc9af15e69725dc2146e5f92b0570b85d4.