Should fix #362.