hotfixed version 2