Fix #42

Should fix #42.