fix getting issues