finally got rid of :safe depracation warning