Cleaned up currency fix