Fiks for #30