bug-fix: uncomment code