Refactor, removed ineffective workaround