Removed usage of 1.7 API