Fixes JEvents/JEvents #155