Theoretically fix #360