Should fix #11