Fix Some Issue

Fix some issue in currency