fixed runtime issues