EPIC bug finded and fixed