One-line conditions fixed