Adding some conditions for a compatibility with my other environments