Uncomment code that should not have to be