Trying to fix weird issues between IntelliJ 13 and 14...