Test and fix #43