Fixes #20 - Limit use of 3.1 class to static inner class