fixed wrong setOnEmpty, got rid of deprecation 0.4.0