Commit from IDEA
A little modification for stability