Troubleshooting and Bug Fix