More Java7 compatibility - MEH!