Simplify code
Revert this change, causes error