Possibly fix #30