Fixed validation of currency
last changes before fist hand over