Workaround for #56 #97
Revert fix regression since #140