Fix issue with Intelij IDEA