#508 fixed script