Another try to comply with Spark rules