Reverted previous "fix"