issue #4: Upgraded for Idea 13