Added compatibility with holoeverywhere