Maybe this will fix MCPC+ compatibility? #36