FIXED: some mess with one-liners.