Fixed running problems