Currency issue fix