Should fix #5

Should fix #5