Attempt to fix melons for 1.8 (might result in issues with pre-1.8).