Added workaround for multiple environments