Adapted to Sprint 0.38