ok, let me think of a cleaner for that. @JensTimmerman any ideas?