Bugfix: Removed java 1.7 features