Revert #52 fix