Fiks for #2