edit to prevent frontend from hanging