fix skasturi's problems